merge
authorStefano Stabellini <sstabellini@xensource.com>
Thu, 12 Aug 2010 17:56:20 +0000 (18:56 +0100)
committerStefano Stabellini <sstabellini@xensource.com>
Thu, 12 Aug 2010 17:56:20 +0000 (18:56 +0100)
commitc865ffc1aaa970a39d4593df52028e08df50658e
tree9ae52114df4d61b4e4a626622b8c323f8693e1d9
parent94413e51b0558f0b55137328d51ce8c26dd358a0
parenta0b0302a08456f071b4b65a6084819048e58b59c
merge